Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 May 2011 16:12:16 +0000 (09:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 May 2011 16:12:16 +0000 (09:12 -0700)
commit4c9a283cbeb9c71f45ace2cb1adb5c72cd905e27
treee459ffba5f760640bd1fb49dacfefbd5fb4b572c
parent3b3a9c57767754f0a6daf9fb9d1e9f23c714acba
parentf513d92a9614bbbee3eced04aced320c0f804139
Merge from trunk.
src/ChangeLog